From cab07ff4274f76e0f56bb2ca025f793fdf0052f1 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Thu, 13 Apr 2006 07:05:53 +0000 Subject: [PATCH] Use function WinOpenURL and readme.html for help. --- gpsbabel/win32/gui-2/about.pas | 2 +- gpsbabel/win32/gui-2/common.pas | 13 +++++++++++-- gpsbabel/win32/gui-2/filter.pas | 9 ++++++++- gpsbabel/win32/gui-2/main.pas | 27 ++++++++++++++++++++------- gpsbabel/win32/gui-2/options.pas | 4 ++-- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/gpsbabel/win32/gui-2/about.pas b/gpsbabel/win32/gui-2/about.pas index a92dba090..f112cd833 100644 --- a/gpsbabel/win32/gui-2/about.pas +++ b/gpsbabel/win32/gui-2/about.pas @@ -113,7 +113,7 @@ end; procedure TfrmAbout.lbURLClick(Sender: TObject); begin TLabel(Sender).Font.Color := clBlue; - WinOpenFile('http://' + TLabel(Sender).Caption); + WinOpenFile('http://' + TLabel(Sender).Caption, ''); end; procedure TfrmAbout.FormKeyDown(Sender: TObject; var Key: Word; diff --git a/gpsbabel/win32/gui-2/common.pas b/gpsbabel/win32/gui-2/common.pas index 8c1804a86..0dcdddb8e 100644 --- a/gpsbabel/win32/gui-2/common.pas +++ b/gpsbabel/win32/gui-2/common.pas @@ -21,12 +21,15 @@ unit common; interface uses - Windows, SysUtils, Classes, Messages, Controls, StdCtrls; + Windows, SysUtils, Classes, Messages, Controls, StdCtrls, Inifiles; const OTypes: array[0..6] of PChar = ('unknown', 'integer', 'float', 'string', 'boolean', 'file', 'outfile'); - + + gpsbabel_knows_inifile: Boolean = False; + gpsbabel_ini: TInifile = nil; + resourcestring SGPSBabelURL = 'http://www.gpsbabel.org'; SGPSBabelTitle = 'GPSBabelGUI-2'; @@ -394,6 +397,12 @@ begin i := SELF.Add(name); SELF.PutObject(i, Pointer(info)); + + if (name = 'garmin_txt') then + begin + gpsbabel_knows_inifile := True; + // add -p "" to command-line + end; break; end; end; diff --git a/gpsbabel/win32/gui-2/filter.pas b/gpsbabel/win32/gui-2/filter.pas index 27180e295..ddc92b92a 100644 --- a/gpsbabel/win32/gui-2/filter.pas +++ b/gpsbabel/win32/gui-2/filter.pas @@ -24,7 +24,7 @@ uses gnugettext, gnugettextDx, Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ComCtrls, Buttons, Mask, ExtCtrls, - common; + common, utils; type TfrmFilter = class(TForm) @@ -81,6 +81,7 @@ type edWayptRadiusLat: TEdit; edWayptRadiusLon: TEdit; cbTrackRangeTimeZone: TCheckBox; + BitBtn2: TBitBtn; procedure cbTrackTimeClick(Sender: TObject); procedure FormCreate(Sender: TObject); procedure cbTrackTitleClick(Sender: TObject); @@ -97,6 +98,7 @@ type procedure FormShow(Sender: TObject); procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); + procedure BitBtn2Click(Sender: TObject); private { Private-Deklarationen } lTrackTimeList: TList; @@ -533,4 +535,9 @@ begin ModalResult := mrCancel; end; +procedure TfrmFilter.BitBtn2Click(Sender: TObject); +begin + WinOpenURL(readme_html_path + '#id274853'); +end; + end. diff --git a/gpsbabel/win32/gui-2/main.pas b/gpsbabel/win32/gui-2/main.pas index b0ebe3eb4..44c578746 100644 --- a/gpsbabel/win32/gui-2/main.pas +++ b/gpsbabel/win32/gui-2/main.pas @@ -23,7 +23,7 @@ interface uses gnugettext, TypInfo, delphi, Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, - StdCtrls, Buttons, ExtCtrls, + StdCtrls, Buttons, ExtCtrls, common, utils, ImgList, ActnList, Menus, ComCtrls, ToolWin; type @@ -337,6 +337,7 @@ begin else if (gpsbabel_vfmt >= '001.002.005') then gpsbabel('-^2', l) else begin + MessageBox(0, PChar(gpsbabel_vfmt), 'Release info', MB_OK); MessageDlg(_('The file "gpsbabel.exe" found in current directory is too old!'), mtError, [mbOK], 0); Halt(1); @@ -362,14 +363,17 @@ begin end; procedure TfrmMain.WMSTARTUP(var Msg: TMessage); +var + s: string; begin +// gpsbabel_ini := TIniFile.Create('gpsbabel.ini'); LoadVersion; EnableOptions(gpsbabel_vfmt); LoadFileFormats; // ? valid README form - - acHelpReadme.Enabled := (frmReadme.Memo.Lines.Count > 0); + s := ExtractFilePath(ParamStr(0)) + 'readme.html'; + acHelpReadme.Enabled := FileExists(s) or (frmReadme.Memo.Lines.Count > 0); end; procedure TfrmMain.InitCombo(Target: TComboBox; IsInput, ForDevice: Boolean); @@ -566,6 +570,7 @@ begin acFinalizeDropDownsExecute(nil); cmdline := ''; + if gpsbabel_knows_inifile then cmdline := '-p ""'; if chbInputDevice.Checked then IFormat := FCaps.GetName(cbInputFormatDevice.Text) @@ -766,7 +771,7 @@ begin l := TStringList.Create; try - if not gpsbabel('-V', l) then Exit; + if not gpsbabel('-p "" -V', l) then Exit; for i := 0 to l.Count - 1 do begin @@ -899,10 +904,17 @@ begin end; procedure TfrmMain.acHelpReadmeExecute(Sender: TObject); +var + s: string; begin - if (frmReadme = nil) then - Application.CreateForm(TfrmReadme, frmReadme); - frmReadme.ShowModal; + s := ExtractFilePath(ParamStr(0)) + 'readme.html'; + if FileExists(s) then + WinOpenFile(s, '') // new readme.html + else begin // show the old readme + if (frmReadme = nil) then + Application.CreateForm(TfrmReadme, frmReadme); + frmReadme.ShowModal; + end; end; procedure TfrmMain.mnuSynthesizeShortNamesClick(Sender: TObject); @@ -1152,6 +1164,7 @@ begin WriteLn('msgstr ""'); WriteLn(''); end; + MessageDlg('..\gpsbabel.po created!', mtInformation, [mbok], 0); finally f.Free; end; diff --git a/gpsbabel/win32/gui-2/options.pas b/gpsbabel/win32/gui-2/options.pas index 14a85d859..0056924bb 100644 --- a/gpsbabel/win32/gui-2/options.pas +++ b/gpsbabel/win32/gui-2/options.pas @@ -172,7 +172,7 @@ begin if (FFormat = '') then begin FFormat := o.format; - btnHelp.Hint := 'http://www.gpsbabel.org/readme.html#' + FFormat; + btnHelp.Hint := readme_html_path + '#' + FFormat; btnHelp.ShowHint := True; end; @@ -462,7 +462,7 @@ end; procedure TfrmOptions.btnHelpClick(Sender: TObject); begin - WinOpenFile('http://www.gpsbabel.org/readme.html#' + FFormat); + WinOpenURL(readme_html_path + '#' + FFormat); end; procedure TfrmOptions.CreateFileOption(const x, y, tag: Integer; o: POption; IsInput: Boolean; xmax: Integer = -1); -- 2.30.2